From a1d775a1fcc9d0cc686fde3d60cede7a814711da Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Thu, 24 Dec 2009 20:37:48 +0000
Subject: [PATCH] Improve detection of newer Holux GR241 firmware.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3844 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/mtk_logger.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gpsbabel/mtk_logger.c b/gpsbabel/mtk_logger.c
index dec0cba47..dea987f24 100644
--- a/gpsbabel/mtk_logger.c
+++ b/gpsbabel/mtk_logger.c
@@ -1398,13 +1398,15 @@ static void file_read(void) {
                mtk_info.track_event |= MTK_EVT_WAYPT;
 
             k = 16;
-            // m241  - HOLUXGR241LOGGER or HOLUXGR241WAYPNT
+            // m241  - HOLUXGR241LOGGER or HOLUXGR241WAYPNT or HOLUXGR241LOGGER<SP><SP><SP><SP>
             // gr245 - HOLUXGR245LOGGER<SP><SP><SP><SP> or HOLUXGR245WAYPNT<SP><SP><SP><SP>
+            if ((mtk_device != HOLUX_GR245) && (memcmp(&buf[i], "HOLUXGR245", 10) == 0)) {
+               dbg(2, "Detected Holux GR245 !\n");
+               holux245_init();
+            }
+
+            // skip the 4 spaces that may occur on every device
             if ( memcmp(&buf[i+16], "    ", 4) == 0 ){ // Assume loglen >= 20...
-               if ( mtk_device != HOLUX_GR245 ){
-                 dbg(2, "Detected Holux GR245 !\n");
-                 holux245_init();
-               }
                k += 4;
             }   
          } else if  ( buf[i] == 0xff && buf[i+1] == 0xff  && buf[i+2] == 0xff && buf[i+3] == 0xff
-- 
2.30.2